From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 3 May 2014 19:12:29 +0000 (+0200)
Subject: osdWindow: Check monitor validity before updating
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2496
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ef04a9d1ed1d8ecad023fe7adb39baa521ec1551;p=gnome-shell.git

osdWindow: Check monitor validity before updating

When a monitor is removed, the OsdWindow for that monitor may process
the monitors-changed signal before OsdWindowManager does (which will
remove the OSD). If that happens, we will currently try to access
an invalid monitor; check for this to avoid a couple of warning.
---

diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index 6263070d1..bcdc39180 100644
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -192,6 +192,8 @@ const OsdWindow = new Lang.Class({
     _monitorsChanged: function() {
         /* assume 110x110 on a 640x480 display and scale from there */
         let monitor = Main.layoutManager.monitors[this._monitorIndex];
+        if (!monitor)
+            return; // we are about to be removed
 
         let scalew = monitor.width / 640.0;
         let scaleh = monitor.height / 480.0;